fix(update): use consistent diff engine for patch-ID matching#124
Merged
fix(update): use consistent diff engine for patch-ID matching#124
Conversation
collect_patch_ids used `git log -p` for upstream commits while batch_patch_ids used `git diff-tree -p` for feature commits. These produce different patch-IDs when diff.algorithm is set (e.g. histogram), because diff-tree ignores the config and always uses Myers. Switch collect_patch_ids to rev-list + diff-tree so both sides use the same engine. Add --empty=drop as a safety net for any commits that slip through filtering. Add integration tests that reproduce the bug by setting diff.algorithm=histogram with a markdown file rewrite. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
collect_patch_ids used
git log -pfor upstream commits whilebatch_patch_ids used
git diff-tree -pfor feature commits. Theseproduce different patch-IDs when diff.algorithm is set (e.g. histogram),
because diff-tree ignores the config and always uses Myers. Switch
collect_patch_ids to rev-list + diff-tree so both sides use the same
engine. Add --empty=drop as a safety net for any commits that slip
through filtering. Add integration tests that reproduce the bug by
setting diff.algorithm=histogram with a markdown file rewrite.
Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com